Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @oli-obk (or someone else) some time within the next two weeks.

Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

• @rustbot author: the review is finished, PR author should check the comments and take action accordingly
• @rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue

⚠️ Warning ⚠️

• These commits modify submodules.

rust-analyzer is developed in its own repository. If possible, consider making this change to rust-lang/rust-analyzer instead.

cc @rust-lang/rust-analyzer

Some changes occurred in src/tools/cargo

cc @ehuss

Please

• rebase (https://rustc-dev-guide.rust-lang.org/git.html?highlight=rebase#rebasing)
• remove submodule changes (https://rustc-dev-guide.rust-lang.org/git.html?highlight=submodu#git-submodules)
• remove rust-analyzer changes
• squash the commits

from this PR

@rustbot author

@Blindspot22: I'll review again once the comments from @oli-obk are addressed and CI tests are passing.

☔ The latest upstream changes (presumably #136225) made this pull request unmergeable. Please resolve the merge conflicts.

Similar to before:

Please
* rebase (https://rustc-dev-guide.rust-lang.org/git.html?highlight=rebase#rebasing)
* remove submodule changes (https://rustc-dev-guide.rust-lang.org/git.html?highlight=submodu#git-submodules)
* squash the commits

@Blindspot22
Thanks for your contribution
From wg-triage. Could you please handle suggestion from comment above

@Blindspot22
From wg-triage. Closed this PR due to inactivity. Feel free to reopen or raised new one. Thanks for your efforts.